# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1069.1.262+1.1069.258.9 -> 1.1069.303.1
#	include/asm-ia64/page.h	1.6.1.4 -> 1.7.1.3
#	include/asm-ia64/processor.h	1.16.3.9 -> 1.16.2.6
#	include/linux/pci_ids.h	1.44.8.2 -> 1.46.1.27
#	            Makefile	1.190.7.14 -> 1.193.1.53
#
diff -Nru a/Makefile b/Makefile
--- a/Makefile	Fri Mar 19 16:24:34 2004
+++ b/Makefile	Fri Mar 19 16:24:34 2004
@@ -93,6 +93,7 @@
 
 CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
 	  -fno-strict-aliasing -fno-common
+CFLAGS += -g
 ifndef CONFIG_FRAME_POINTER
 CFLAGS += -fomit-frame-pointer
 endif
@@ -307,8 +308,7 @@
 	$(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in
 
 xconfig: symlinks
-	$(MAKE) -C scripts kconfig.tk
-	wish -f scripts/kconfig.tk
+	@echo -e "***\n* Sorry, xconfig is broken; use \"make menuconfig\" instead.\n***"
 
 menuconfig: include/linux/version.h symlinks
 	$(MAKE) -C scripts/lxdialog all